From aacbdffaf8d19408facb5e8213bb7af8e22f3136 Mon Sep 17 00:00:00 2001 From: "kaf24@localhost.localdomain" Date: Fri, 26 Jan 2007 13:31:59 +0000 Subject: [PATCH] Replace mlock() calls with lock_pages(). Signed-off-by: Russell Blaine --- tools/libxc/xc_misc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 216dff94f8..b2a648528a 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -110,15 +110,15 @@ int xc_hvm_set_pci_intx_level( arg.intx = intx; arg.level = level; - if ( mlock(&arg, sizeof(arg)) != 0 ) + if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 ) { PERROR("Could not lock memory"); - return -1; + return rc; } rc = do_xen_hypercall(xc_handle, &hypercall); - safe_munlock(&arg, sizeof(arg)); + unlock_pages(&arg, sizeof(arg)); return rc; } @@ -140,15 +140,15 @@ int xc_hvm_set_isa_irq_level( arg.isa_irq = isa_irq; arg.level = level; - if ( mlock(&arg, sizeof(arg)) != 0 ) + if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 ) { PERROR("Could not lock memory"); - return -1; + return rc; } rc = do_xen_hypercall(xc_handle, &hypercall); - safe_munlock(&arg, sizeof(arg)); + unlock_pages(&arg, sizeof(arg)); return rc; } @@ -168,15 +168,15 @@ int xc_hvm_set_pci_link_route( arg.link = link; arg.isa_irq = isa_irq; - if ( mlock(&arg, sizeof(arg)) != 0 ) + if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 ) { PERROR("Could not lock memory"); - return -1; + return rc; } rc = do_xen_hypercall(xc_handle, &hypercall); - safe_munlock(&arg, sizeof(arg)); + unlock_pages(&arg, sizeof(arg)); return rc; } -- 2.30.2